Solve merge issues 3