+ Fixed minor merge bug