Going to pull changes
fixed conflicts
going to pull
fixed merging conflicts
added project id to tickets
fixed pull merging