Fix - identifiers error after merge