resolve merge conflict for updated single.php