testing this adding stuff Edit remotely and try to commit localy

trying a new branch "new". this is just for it

Making a merge conflict!