Fixed errors with merge