conflict resolved and code merged