Solved some added merge conflicts, might have accidentally removed restorefiletask.java. Added comments.