Git Push problem? resolving 2...