fixed some wierd merging error