(bug)Fixed errors that occured during merge