before merge
done merging