some error
Resolving the merge