adding barfolina pavillion
delete conflict files