Update CREDITS

resolve conflict text