fixing push and commit conflicts