allignment pre merge in master