Fixed spelling mistake (appereance)
Conflict resolving