Debugged errors due to merge