Resolved last merged conflicts