minor changes
fixing conflict