Computing heading
Fixing merge conflict.