Fixed some problems with merging with bas