Resolve merge conflics
merge conflics