Revert "Resolve conflicts problem"

This reverts commit afab3ed99ca426c3111d95e5cf61c0edef153ba4.