created advanced file
updated advanced
fixed conflict