[#4] Weird merging issue solved