Attempt to resolve conflict in front end branch