Resolved error after merge