Partially working
Resolved conflict
Removing temp file form repository