got new merge working properly
deleted old folder