Some conflicts fixed