Remove merge conflict and comment out testing