setting up directive
fix merge conflict and delete code