* fix conflicts