Merged Branches properly & Added shifts