added attendance file
fixing merge
merge fix