Improper reverse push, resolving conflicts.