head conflicts removed and reverted back to previous commit