fix conflicts agains bct