fixed merge bug again..