Merging. Some problems
End merging
End pushing