Fixed merge isses