Removing admin configure.php from tracking
Remove merge conflicts