removed @end statements from mergin