Re merged conflicts