Fixed merge isue