code conventions merge