Fixed merge mess