adding files
added some actions
fixed conflict