Merge YCM init and update