Resolve Conflict Version 2