changed file on the slave branch
changed file just befere merge
changed file after merge and problem solving