Fixed formatting and merge issues