just before merge
deleted stuff for merging