before merge
fix conflicts before merge