fix needs merge bug