add some of my skills
addind git skills
fixed merge conflicts