get_full_path now works with double dots
Solve conflicts