sort out conflicts, remove debug out put