Front end conflict

merge master