added actions, did a manual merge
fixed merge conflict