before merge
after merge and clean
deleted unneeded
final