prepare merge
fix conflicts