Cleaned up file confilcts