Added file checkout. Wrote function stub for merge