Fixed merge related error