Solving problems of last merge (not ready yet )