Fixed merge bugg