pulling
merge conflicts fixed
master xml creation completed