Little problems trying to merge between branches