Dev info

Try to solve conflict by WinMerge